Autogenerated HTML docs for v2.47.0-72-gef8ce8
diff --git a/gitcli.html b/gitcli.html index 578650e..f74300f 100644 --- a/gitcli.html +++ b/gitcli.html
@@ -480,24 +480,24 @@ </li> <li> <p>Revisions come first and then paths. -E.g. in <code>git diff v1.0 v2.0 arch/x86 include/asm-x86</code>, +E.g. in <code>git</code> <code>diff</code> <code>v1.0</code> <code>v2.0</code> <code>arch/x86</code> <code>include/asm-x86</code>, <code>v1.0</code> and <code>v2.0</code> are revisions and <code>arch/x86</code> and <code>include/asm-x86</code> are paths.</p> </li> <li> <p>When an argument can be misunderstood as either a revision or a path, they can be disambiguated by placing <code>--</code> between them. -E.g. <code>git diff -- HEAD</code> is, "I have a file called HEAD in my work +E.g. <code>git</code> <code>diff</code> <code>--</code> <code>HEAD</code> is, "I have a file called HEAD in my work tree. Please show changes between the version I staged in the index and what I have in the work tree for that file", not "show the difference between the HEAD commit and the work tree as a whole". You can say -<code>git diff HEAD --</code> to ask for the latter.</p> +<code>git</code> <code>diff</code> <code>HEAD</code> <code>--</code> to ask for the latter.</p> </li> <li> <p>Without disambiguating <code>--</code>, Git makes a reasonable guess, but errors out and asks you to disambiguate when ambiguous. E.g. if you have a -file called HEAD in your work tree, <code>git diff HEAD</code> is ambiguous, and -you have to say either <code>git diff HEAD --</code> or <code>git diff -- HEAD</code> to +file called HEAD in your work tree, <code>git</code> <code>diff</code> <code>HEAD</code> is ambiguous, and +you have to say either <code>git</code> <code>diff</code> <code>HEAD</code> <code>--</code> or <code>git</code> <code>diff</code> <code>--</code> <code>HEAD</code> to disambiguate.</p> </li> <li> @@ -525,9 +525,9 @@ <div class="paragraph"> <p>The former lets your shell expand the fileglob, and you are asking the dot-C files in your working tree to be overwritten with the version -in the index. The latter passes the <code>*.c</code> to Git, and you are asking +in the index. The latter passes the *.<code>c</code> to Git, and you are asking the paths in the index that match the pattern to be checked out to your -working tree. After running <code>git add hello.c; rm hello.c</code>, you will <em>not</em> +working tree. After running <code>git</code> <code>add</code> <code>hello.c</code>; <code>rm</code> <code>hello.c</code>, you will <em>not</em> see <code>hello.c</code> in your working tree with the former, but with the latter you will.</p> </div> @@ -546,20 +546,20 @@ <div class="ulist"> <ul> <li> -<p>Splitting short options to separate words (prefer <code>git foo -a -b</code> -to <code>git foo -ab</code>, the latter may not even work).</p> +<p>Splitting short options to separate words (prefer <code>git</code> <code>foo</code> <code>-a</code> <code>-b</code> +to <code>git</code> <code>foo</code> <code>-ab</code>, the latter may not even work).</p> </li> <li> <p>When a command-line option takes an argument, use the <em>stuck</em> form. In -other words, write <code>git foo -oArg</code> instead of <code>git foo -o Arg</code> for short -options, and <code>git foo --long-opt=Arg</code> instead of <code>git foo --long-opt Arg</code> +other words, write <code>git</code> <code>foo</code> <code>-oArg</code> instead of <code>git</code> <code>foo</code> <code>-o</code> <code>Arg</code> for short +options, and <code>git</code> <code>foo</code> <code>--long-opt=Arg</code> instead of <code>git</code> <code>foo</code> <code>--long-opt</code> <code>Arg</code> for long options. An option that takes optional option-argument must be written in the <em>stuck</em> form.</p> </li> <li> <p>When you give a revision parameter to a command, make sure the parameter is not ambiguous with a name of a file in the work tree. E.g. do not write -<code>git log -1 HEAD</code> but write <code>git log -1 HEAD --</code>; the former will not work +<code>git</code> <code>log</code> <code>-1</code> <code>HEAD</code> but write <code>git</code> <code>log</code> <code>-1</code> <code>HEAD</code> <code>--</code>; the former will not work if you happen to have a file called <code>HEAD</code> in the work tree.</p> </li> <li> @@ -611,9 +611,9 @@ </div> </div> <div class="paragraph"> -<p>Note that some subcommand (e.g. <code>git grep</code>) may behave differently -when there are things on the command line other than <code>-h</code>, but <code>git -subcmd -h</code> without anything else on the command line is meant to +<p>Note that some subcommand (e.g. <code>git</code> <code>grep</code>) may behave differently +when there are things on the command line other than <code>-h</code>, but <code>git</code> +<code>subcmd</code> <code>-h</code> without anything else on the command line is meant to consistently give the usage.</p> </div> </dd> @@ -630,7 +630,7 @@ <h3 id="_negating_options">Negating options</h3> <div class="paragraph"> <p>Options with long option names can be negated by prefixing <code>--no-</code>. For -example, <code>git branch</code> has the option <code>--track</code> which is <em>on</em> by default. You +example, <code>git</code> <code>branch</code> has the option <code>--track</code> which is <em>on</em> by default. You can use <code>--no-track</code> to override that behaviour. The same goes for <code>--color</code> and <code>--no-color</code>.</p> </div> @@ -639,8 +639,8 @@ <h3 id="_aggregating_short_options">Aggregating short options</h3> <div class="paragraph"> <p>Commands that support the enhanced option parser allow you to aggregate short -options. This means that you can for example use <code>git rm -rf</code> or -<code>git clean -fdx</code>.</p> +options. This means that you can for example use <code>git</code> <code>rm</code> <code>-rf</code> or +<code>git</code> <code>clean</code> <code>-fdx</code>.</p> </div> </div> <div class="sect2"> @@ -648,10 +648,10 @@ <div class="paragraph"> <p>Commands that support the enhanced option parser accepts unique prefix of a long option as if it is fully spelled out, but use this -with a caution. For example, <code>git commit --amen</code> behaves as if you -typed <code>git commit --amend</code>, but that is true only until a later version +with a caution. For example, <code>git</code> <code>commit</code> <code>--amen</code> behaves as if you +typed <code>git</code> <code>commit</code> <code>--amend</code>, but that is true only until a later version of Git introduces another option that shares the same prefix, -e.g. <code>git commit --amenity</code> option.</p> +e.g. <code>git</code> <code>commit</code> <code>--amenity</code> option.</p> </div> </div> <div class="sect2"> @@ -698,7 +698,7 @@ <li> <p>The <code>--cached</code> option is used to ask a command that usually works on files in the working tree to <strong>only</strong> work -with the index. For example, <code>git grep</code>, when used +with the index. For example, <code>git</code> <code>grep</code>, when used without a commit to specify from which commit to look for strings in, usually works on files in the working tree, but with the <code>--cached</code> option, it looks for strings in @@ -707,7 +707,7 @@ <li> <p>The <code>--index</code> option is used to ask a command that usually works on files in the working tree to <strong>also</strong> -affect the index. For example, <code>git stash apply</code> usually +affect the index. For example, <code>git</code> <code>stash</code> <code>apply</code> usually merges changes recorded in a stash entry to the working tree, but with the <code>--index</code> option, it also merges changes to the index as well.</p> @@ -715,7 +715,7 @@ </ul> </div> <div class="paragraph"> -<p><code>git apply</code> command can be used with <code>--cached</code> and +<p><code>git</code> <code>apply</code> command can be used with <code>--cached</code> and <code>--index</code> (but not at the same time). Usually the command only affects the files in the working tree, but with <code>--index</code>, it patches both the files and their index
